Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Jul 2011 16:47:27 +0000 (09:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Jul 2011 16:47:27 +0000 (09:47 -0700)
commit0b447b146459b62c0b4e096d7f6f0ab5bb6ce211
tree9aa9500f03e4171a2275c095497b863e5683a60d
parente0ef68091990f0c9aa13b2691fa69ad16a7cd0f1
parent152d2a98060253c2d73bc74eca151fb3f8db8035
Merge from trunk.